Fix install of babl vapi file

The pkg-config package refered no longer exists,
and currently only libvala provides a vapidir in pkg-config,
and this package is versioned and changes all the time.
Other projects just use $(datadir)/vala/vapi, so we do the same

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 8b48f106e4ee6f6f39cf8bc90f75b64b4896a7dc..ae45b021a5dbd3e8c57d39f5bcdec7a85a325daf 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -125,7 +125,7 @@ if HAVE_VALA
 babl-$(BABL_API_VERSION).vapi: Babl-$(BABL_API_VERSION).gir
        $(VAPIGEN) --library=babl-$(BABL_API_VERSION) Babl-$(BABL_API_VERSION).gir
 
-vapidir=@vapidir@
+vapidir=$(datadir)/vala/vapi
 vapi_DATA = babl-$(BABL_API_VERSION).vapi
 
 endif # HAVE_VALA

diff --git a/configure.ac b/configure.ac
index 126b5e4a76935faf47b7d6bb3040f7b57df5a69e..02b43f6a29cbec75ca9ffd343e2b6bad9c2d86a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -85,9 +85,6 @@ fi
 have_vala=$have_vapigen
 AM_CONDITIONAL(HAVE_VALA, test "$have_vala" = "yes")
 
-vapidir=$(pkg-config --variable vapidir vala-1.0)
-AC_SUBST(vapidir)
-
 dnl The symbol BABL_UNSTABLE is defined above for substitution in
 dnl Makefiles and conditionally defined here as a preprocessor symbol
 dnl and automake conditional.